Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 7 Apr 2006 10:52:00 +0000 (11:52 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 7 Apr 2006 10:52:00 +0000 (11:52 +0100)

Trivial merge